Merge "Add exported includes to libwpa_client" am: 7cfb967dde
am: 59606334cc

Change-Id: Ibcb4e83120df0175b5306eb5a8ae41bab1aa4d05