[automerger skipped] Merge "Use the package name passed through aidl." am:...
[automerger skipped] Merge "Use the package name passed through aidl." am: bdadf10d am: 32af9629
am: 480a91d0 -s ours
am skip reason: change_id I35c81bb4570fdd62e21cd519295875eb4bad1196 with SHA1 edc82746 is in history
Change-Id: Ib419434b651dcaf3d9c209a42d710567068965b9