sam: separating bootstrap for image builder and android, simplifying install/upgrade