Merge "Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore"