Merge "Use override_export_include_dirs." am: affd4e9bd9 am: c89b767401
am: 25a8d084f6

Change-Id: Ie72a68b427ae3679c3f9e857b0587b8128e8055f