Merge "Gralloc: AIDL HAL may replace HIDL HAL." into tm-dev