Merge "Remove FRAMEBUFFER_FORCE_FORMAT" am: 0322a7176f
am: 04f46f0347

Change-Id: I19d40d6877f9831608c9261370a66799e56a5397