Merge changes from topic 'gralloc_usage_flags' into oc-mr1-dev
am: 81ae83bd1d

Change-Id: Ib60cb2188caf822442fc87ae5fd6d0168bae5c24