Merge "Remove packagemanager_aidl from export_shared_lib_headers"