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

Change-Id: I52c45129facb38dd0a346ac9cc5f0b82a92cf00e