Support new Android libraries.
Merge remote-tracking branch 'origin/master'