Merge "Remove flinger_headers"