am 8acb27c5: Merge "Tentative fix for aidl import issue"

* commit '8acb27c505c610b4027ec3d140ccc7722ab4faa3':
  Tentative fix for aidl import issue