Merge jb-dev-mako plus fixes to libc/kernel/common/linux/fb.h

Change-Id: I1fbe64653db7b8e9bfc6e10fa42deb295aa15a09