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

* commit '1b587c943ec9eae4341e2f540611bc32d000e798':
  64-bit in android-L