Revert "Revert "Update Build Prop""

This reverts commit 23bc007c9f5d3c074a40185d4f91e349e21e9ae9.

Change-Id: Ia8cdddd0d0f66515e2b309d732f45ceac1d6c746