Merging subree android
No longer deploying default bootconfig.json