Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS"
am: 1c0b5eaf83

Change-Id: I356a040d02e2838fada7ae8472078579b516e8b0