Fix for android host and Cmake modifcations for Android

Android host was broken after the reorg.
This merges in the fixes for that and gets android libmoai building under cmake