This reverts commit 2a40cc6996. Reason for revert: Broke a bunch of builds, platform/system/tools/bpt must be missing from more manifests. Change-Id: I4c367a1fec5c62c247544227e9d3b596227e31da
2a40cc6996