[Android] - Post reorginization fixes
+ Fixed the android build after project reorginization