Merge "Make gralloc0 pass-through mapper handle layers" am: b756e23e5c am: 6982d1aec5
am: 6c3213c940

Change-Id: I4a2289ef124970485b6ae273131f9ed33bec20bc