Merge branch 'anv-android'