Merge "Revert "Add new AHardwareBuffer formats and usages with latest HAL change.""