Merge "Remove headers from LOCAL_SRC_FILES"