Fix Environment setup for android to match the new unified headers. Adjust the Makefile accordingly. Updated the test scripts and travis to test these changes.