Merge "SurfaceFlinger: Use TARGET_OUT_HEADERS"