Merge "Make __ANDROID_APEX_<NAME>__ macro optional" am: 6efd3598c5

Change-Id: I71a7d1f7e0ad08f9edd037645ed9b38f1457816d