Build fixes, Android library now compiles when built from other Android projects