Merge "Add LOCAL_EXPORT_C_INCLUDE_DEPS" am: 1c0b5eaf83
am: b1fdb9745f

Change-Id: I3388804b77e7125526bf6ea2814bbeb38bbc5f31