Merge "Add LOCAL_EXPORT_CFLAGS for Soong" am: a1c1e7d02f am: 1cc4bfaad5
am: 0320aea2fd  -s ours

Change-Id: I014b3f9f3aa913f2bbebe5033c3e8a6fbb249729