Revert "Track AOSP's bootable/recovery"

This reverts commit 86d35a18afd03bb3db3ae48ceb3f27ba41fb5eb2.