Merge "Set up aidl for gtest"