Add Android v4 support
Merge branch 'master' into la