Add some tweaks to build.prop, fix build errors

Change-Id: Ie2810a6141050060c31be319e6de36629b392c6c