am 8a6e9676: am cf5237b5: Merge "Mark prebuilt libs as 32-bit."

* commit '8a6e96769b739ae67c30e1c63e77479a4f7d88bc':
  Mark prebuilt libs as 32-bit.