Merge "Apply more generic AIDL package name on jarjar rule."