ca84552505
This reverts commit 2687257c98.
Reason for revert: Reverting post-build
Change-Id: Ic3a1e8ed84a227b42bc35b91d4f0eed60bb2e29c