Merge branch 'android' into devel