Remove bootable/recovery
Track upstream frameworks/ex