Merge "Remove header from LOCAL_SRC_FILES"