am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."

* commit 'b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
  Resolve :32 to 32-bit variant only if the variant exists.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build