Merge "Remove obsolete aidl list" am: abac8f7a86 am: 6b8fff4eb5
am: 48d6926f38  -s ours

Change-Id: I71bf710fd98e857a69163ba2302db5369aa8337a