[[ Bug 13800 ]] Fixes for few errors generated with the new Android SDK