Merge "Fixed a wrong AIDL import path"
am: aa038e2f4d

Change-Id: I8f3bf6b512ac1a0509ceb17cfa35efd0af6581b8