Fix #4247, No action bar on map activities on Android 3.x

Enable 2.x implementation for 3.x. as well.
Additionally fix options menu for 3.x