am 7c93839d: Revert "Tentative fix for aidl import issue"

* commit '7c93839d7b41727c11925b034d4ec84491d3dee1':
  Revert "Tentative fix for aidl import issue"