am cf471647: am 267cb88f: Merge "Set up aidl for gtest"

* commit 'cf4716473d5af3cd257b7e093c95c9b63b3b32c9':
  Set up aidl for gtest