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

* commit 'ea738930745abb58ce8a8c56a6fbd0c5119ba0ce':
  64-bit in android-L