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

* commit 'f3d846d0bd221d24c42af30711c2927e6cc398b8':
  Set up aidl for gtest