Merge "Remove "ro." prefix from sdk extension props" am: dc160ffbb2

Change-Id: I042bd0a3ec278a8ca5a8d1064650ab4ba7142c05