Merge branch 'release/android_0.1.5_r1' into develop
upgrade OpenAphid to 0.2.1f
Merge branch 'develop'