Merge "Freeze HALs for Android R" into rvc-dev