[automerger skipped] Merge "apex: Make android_library support APEX variants"...
[automerger skipped] Merge "apex: Make android_library support APEX variants" am: 5ab5856d am: 17a86991 -s ours am: 6879d2b0 -s ours
am skip reason: Change-Id I3a21d653fe9c4159e3a89791fe1a8597865eeae6 with SHA-1 11c2093e is in history
Change-Id: I50894b1d87499c275532c627b468306841398e7c