Revert serveral changes to a CAF/AOSP base but keep the useful build tools 2