Merge "Make __ANDROID_APEX_<NAME>__ macro optional" into rvc-dev am: e1ededc8 am: c1fe12aa am: 0f6820b0 Change-Id: I9168b877c9776a5624de99ac6dd65745d23c2e76