Merge "Fix for android.os.cts.AbiTest#testNo64 failure"