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

Change-Id: I9a7d9407f62d66989eaa9275ca71dec45e2f959b