Switch to ubuntu jre

scripts/install-sdk.sh

@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 # If the installation flag of the Android SDK is set
 # we download the Android command-line tools,
 # install the SDK, platform tools and the emulator.

scripts/start-emulator.sh

@@ -31,16 +31,11 @@ wait_for_boot &
 
 # Start the emulator with no audio, no GUI, and no snapshots.
 echo "Starting the emulator ..."
-if emulator \
+emulator \
   -avd android \
   -noaudio \
   -no-boot-anim \
   -no-window \
   -no-snapshot-save \
   -qemu \
-  -enable-kvm;
-then
-  update_state "stopped"
-else 
-  update_state "stopped"
-fi
+  -enable-kvm || update_state "stopped"