Merge "libnativewindow: remove software flex pixel formats from VNDK" into pi-dev