Merge "Add AIDL type for HardwareBuffer"