Merge changes from topic "gralloc-mapper-cleanup"
am: 779a7aa37a

Change-Id: Ia48ae7515fac374a5a99efcb8b230b4f3dca57f0