Merge "Generate apex_available from c2a instead of a patch"