Small Android SDK naming issues fixed.