[automerger skipped] Merge "apex: Make android_library support APEX variants"...
[automerger skipped] Merge "apex: Make android_library support APEX variants" into rvc-dev am: e0937418 am: 05f46693 -s ours
am skip reason: Change-Id I3a21d653fe9c4159e3a89791fe1a8597865eeae6 with SHA-1 040ff3d5 is in history
Change-Id: I6ce5ccdbe421e2c18849814fab73c252f50d139b