Merge "Remove framebuffer_target" into oc-dev
am: c6c0c9c730

Change-Id: I6d65d8fb4d0586228890327c478bfce57cf3c7f7