-[ANDROID][MISC] Fixes compilation issues on android and ARC