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

Change-Id: Ic519440a098e321db28837c55a1f7dfa055c0bbe