Merge in Android changes

Bump 1.6.0