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

Change-Id: I0dda2c3463257bfecee1fd52e607ffbad38c6646