[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: 14e8124c -s ours
am skip reason: Change-Id I3a21d653fe9c4159e3a89791fe1a8597865eeae6 with SHA-1 11c2093e is in history
Change-Id: I26d47b34f9d4b5bdb3759ac5e182b0fde01e2af8