build.prop cleanup

Change-Id: Ief0fd1840d22753625565be23fb899b202abd503