[automerger skipped] Merge "apex: Make android_library support APEX variants" am: 5ab5856db3
am: 17a8699112
-s ours
am skip reason: Change-Id I3a21d653fe9c4159e3a89791fe1a8597865eeae6 with SHA-1 11c2093ea3
is in history
Change-Id: Ibc998de01458d0d03c7f4447a7e25deb4ad75c7e
This commit is contained in: