Merge "64-bit in android-L"