am 06e1e784: am f5b8005b: Merge "add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits" into mnc-dev

* commit '06e1e78489634aab05ffc67fa790b508a4dde296':
  add GRALLOC_USAGE_HW_COMPOSER flag to video usage bits