Revert "Update Build Prop"

This reverts commit d92c45121f037eb77b952976f30237d5c7a4cb5d.

Change-Id: If260fc37665dffd68eb9a4b3f85f1d2b453258c3