[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 -s ours
am skip reason: Change-Id I3a21d653fe9c4159e3a89791fe1a8597865eeae6 with SHA-1 040ff3d5 is in history
Change-Id: I60fe07d03a0c3e188b782522bbbfe3bc9c09372d