Merge AndroidBootstrap