Merge "Add LOCAL_EXPORT_CFLAGS for Soong" am: a1c1e7d02f
am: 1cc4bfaad5

Change-Id: I13abbdc51cb28f94364449cdb34ea2cb80cbc503