Merge "Replace LOCAL_C_INCLUDES with header lib dependency." am: 2cb9b1b621 am: 8ff5ee3a2d
am: 917a18f235

Change-Id: I91906b2448ab0afe83411ae568a093c156c55fac