Merge "Use LOCAL_ADDITIONAL_M4DEFS for file_contexts"