Merge "Use LOCAL_ADDITIONAL_M4DEFS for file_contexts"
am: 3e8f7bcda5

Change-Id: I9b8cc25f01cc4eb3b9d0b72a22e057db54dc3b09