Merge "example AIDL HAL extension" am: 028bb37546
am: 10476a1bc8

Change-Id: If4239634f148cbfd7aa6f2528af15468fe4be9fd