Added misc build.prop edits

Change-Id: I94c763399058cd94505ea6b91d55ddace0e8ec65