Merge "Remove unused AIDL files" am: d0abc863f4 am: 43f665c95e
am: 3dbbd3d3a9

Change-Id: Ida23b5013fa6a3e1fd6ba3e5a699f798f29b4b84