Merge "tests/framebuffer: Remove dead minui.h." am: c2f3086b91
am: 30d2123f24

Change-Id: Ia057eb4f43a4d5b4941dac98f61e9525c0208e98