Merge "Replace LOCAL_C_INCLUDES with header lib dependency."
am: 2cb9b1b621

Change-Id: I87efe0d42d0856fd3f47d73043e43ae311c99f00