Merge "Make gralloc enums unsigned" am: e1582496f9
am: e4f267c1a1

Change-Id: I6c75d413fa8cb1702b7e3783be5454a2567fcc6e