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

Change-Id: I4b2f10410049b05689b71b29a892703797ecdcd0