Merge "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits" into mnc-dev