Fixed Android compile problems