am 4b9e4a32: am ea738930: am 1b587c94: Merge "64-bit in android-L"

* commit '4b9e4a3294cec41364d9b444066b812c82d20d35':
  64-bit in android-L