Add command line option support for Android
Merge branch 'fix-snippet-exception' into integration