Merge "Match src paths with aidl package name" am: 8b9a14e7fc
am: 7e5c0ebf14

Change-Id: Ib081a571b20c46015de7010527aa8b9ed1f4be31