Merge "Remove AIDL-libs from VNDK" into tm-dev-plus-aosp