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

Change-Id: I3d966c647103c45f8a078adcb4260c08174cf61c