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

Change-Id: Ie5bafe1ae8851aa8a79a76024f652b575380c170