Build.prop cleaning

Change-Id: I3a4c735e35c59362c728ecb00c4c13e3f8c6f6f3