am 2daeb124: am edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"

* commit '2daeb124818ade7b83deaa9decd1592473ec19f3':
  libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc