cp service/aidl/1.x/Android.bp.disabled service/aidl/1.x/Android.bp
cp src/aidl/1.x/Android.bp.disabled src/aidl/1.x/Android.bp

rm src/4.x/allocator/Android.bp
rm service/4.x/Android.bp