diff --git a/extensions-android/build.sh b/extensions-android/build.sh
index b740305..f2b4ddb 100755
--- a/extensions-android/build.sh
+++ b/extensions-android/build.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Need to set Environment variables
+# CROSSWALK_APP_TOOLS_CACHE_DIR=<path>: Keep downloaded files in this dir
+
 # directory containing this script
 PROJECT_DIR=$(cd $(dirname $0) ; pwd)
 
@@ -25,14 +28,12 @@ echo
 cd $EXTENSION_SRC
 ant
 
-# location of Crosswalk Android (downloaded during extension build)
-XWALK_DIR=$EXTENSION_SRC/lib/`ls lib/ | grep 'crosswalk-'`
+# location of latest crosswalk zip 
+XWALK_ZIP=`find $CROSSWALK_APP_TOOLS_CACHE_DIR -name 'crosswalk-*.zip' |sort -r |sed -n '1p'`
 
 # build the apks
 echo
 echo "********* BUILDING ANDROID APK FILES..."
-cd $XWALK_DIR
-python make_apk.py --fullscreen --enable-remote-debugging --manifest=$APP_SRC/manifest.json --extensions=$EXTENSION_SRC/xwalk-echo-extension/ --package=org.crosswalkproject.sample
-
-# back to where we started
 cd $PROJECT_DIR
+$CROSSWALK_APP_TOOLS_CACHE_DIR/crosswalk-app-tools/src/crosswalk-pkg --crosswalk=$XWALK_ZIP --platforms=android --android=$1 --targets=$2 --enable-remote-debugging $APP_SRC
+
diff --git a/extensions-android/xwalk-echo-app/manifest.json b/extensions-android/xwalk-echo-app/manifest.json
index 3ac406e..08d6909 100644
--- a/extensions-android/xwalk-echo-app/manifest.json
+++ b/extensions-android/xwalk-echo-app/manifest.json
@@ -1,11 +1,12 @@
 {
   "name": "xwalk_echo_app",
-  "version": "0.0.1",
+  "xwalk_app_version": "0.0.1",
   "start_url": "index.html",
+  "xwalk_package_id": "org.crosswalkproject.sample",
+  "xwalk_extensions": ["../xwalk-echo-extension-src/xwalk-echo-extension"],
   "icons": [
     {
       "src": "icon.png",
-      "type": "image/png",
       "sizes": "96x96"
     }
   ]
diff --git a/hello-world/manifest.json b/hello-world/manifest.json
index 547ddef..a9b4686 100644
--- a/hello-world/manifest.json
+++ b/hello-world/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "Hello World",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.helloworld"
 }
diff --git a/simd-mandelbrot/manifest.json b/simd-mandelbrot/manifest.json
index 7cd0ddb..d6b934a 100644
--- a/simd-mandelbrot/manifest.json
+++ b/simd-mandelbrot/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "SIMD",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.simd"
 }
diff --git a/space-dodge-game/base/manifest.json b/space-dodge-game/base/manifest.json
index 2377486..ff463e5 100644
--- a/space-dodge-game/base/manifest.json
+++ b/space-dodge-game/base/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "Space Dodge",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.spacedodgegame"
 }
diff --git a/space-dodge-game/manifest-orientation-resize/manifest.json b/space-dodge-game/manifest-orientation-resize/manifest.json
index c3bedff..cd68f46 100644
--- a/space-dodge-game/manifest-orientation-resize/manifest.json
+++ b/space-dodge-game/manifest-orientation-resize/manifest.json
@@ -1,14 +1,8 @@
 {
   "name": "Space Dodge",
-  "xwalk_version": "0.0.1",
+  "xwalk_app_version": "0.0.1",
   "start_url": "index.html",
   "orientation": "landscape",
   "display": "fullscreen",
-  "xwalk_launch_screen": {
-    "ready_when": "custom",
-    "landscape": {
-      "background_color": "#11f",
-      "image": "fg.png"
-   }
-  }
+  "xwalk_package_id": "org.xwalk.spacedodgegame"
 }
diff --git a/space-dodge-game/manifest-orientation-scale/manifest.json b/space-dodge-game/manifest-orientation-scale/manifest.json
index c3bedff..cd68f46 100644
--- a/space-dodge-game/manifest-orientation-scale/manifest.json
+++ b/space-dodge-game/manifest-orientation-scale/manifest.json
@@ -1,14 +1,8 @@
 {
   "name": "Space Dodge",
-  "xwalk_version": "0.0.1",
+  "xwalk_app_version": "0.0.1",
   "start_url": "index.html",
   "orientation": "landscape",
   "display": "fullscreen",
-  "xwalk_launch_screen": {
-    "ready_when": "custom",
-    "landscape": {
-      "background_color": "#11f",
-      "image": "fg.png"
-   }
-  }
+  "xwalk_package_id": "org.xwalk.spacedodgegame"
 }
diff --git a/space-dodge-game/screen-orientation-resize/manifest.json b/space-dodge-game/screen-orientation-resize/manifest.json
index 2377486..ff463e5 100644
--- a/space-dodge-game/screen-orientation-resize/manifest.json
+++ b/space-dodge-game/screen-orientation-resize/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "Space Dodge",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.spacedodgegame"
 }
diff --git a/space-dodge-game/screen-orientation-scale/manifest.json b/space-dodge-game/screen-orientation-scale/manifest.json
index 2377486..ff463e5 100644
--- a/space-dodge-game/screen-orientation-scale/manifest.json
+++ b/space-dodge-game/screen-orientation-scale/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "Space Dodge",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.spacedodgegame"
 }
diff --git a/webgl/manifest.json b/webgl/manifest.json
index 24c8ecf..a07f7e8 100644
--- a/webgl/manifest.json
+++ b/webgl/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "WebGLSample",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.webgl"
 }
diff --git a/webrtc/client/manifest.json b/webrtc/client/manifest.json
index ce09383..f2710b7 100644
--- a/webrtc/client/manifest.json
+++ b/webrtc/client/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "WebRTC",
-  "xwalk_version": "0.0.1",
-  "start_url": "index.html"
+  "xwalk_app_version": "0.0.1",
+  "start_url": "index.html",
+  "xwalk_package_id": "org.xwalk.webrtc"
 }