Merge "Remove obsolete aidl list" am: abac8f7a86
am: 6b8fff4eb5

Change-Id: If5a5bf062a0fa586349763da9654b698dae0b30d