Merge "Fix format for VR virtual display backing buffers" into oc-dev am: 1daf6cca42
am: 724d05cf9c

Change-Id: I8c27dd238e38daeeb27b1cc083730309e167319d