Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build"