More robustness in model. Upgraded to android version 18 for simpler travis.
Simpler android sample