Merge "Expand HardwareBuffer owners to include header"