fix chrome unlock infinite loop issue
android testsuite fixes
update sample-code repo with newer uicatalog
Simplify getDeviceType()
Rewrite unit tests for getDeviceType()