Merge "Use ro.build.version.extensions.r" am: c410209ec3 am: 9af25780ca am: a89b70f3b5

Change-Id: Id0b2f91221354356cb997c2e9d44ba08ddbfab2b