Added misc build.prop edits

Change-Id: I8155e5f938d5c1f5a925ebbcd32d3bb8c7245114