Merge \"gralloc1: Add mutexes\" into nyc-mr1-dev
am: 09c53ae0da

Change-Id: I73ff20c45bb54f1a33605062603da5a0bc6b83aa