Merge "Freeze HALs for Android S" into sc-dev