MAJOR REVERT! Latest official broke Android...
Revert pt 2
Merge remote-tracking branch 'upstream/master'
Fixed stupid stuff (gralloc)

Such as blindly assuming 4byte sized pixel formats... >_>
Merge remote-tracking branch 'upstream/master'