am 79b43f5b: am f1a858c7: Fix broken aidl

* commit '79b43f5bbced73f6979a82edb5dae2399cbce1bf':
  Fix broken aidl