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

Change-Id: I07eedd1a9ed07fa7b6dce9611651bf552f585dc3