Merge "Clean framework-aidl-export-defaults up"