Android v0.7 art
Merge remote-tracking branch 'origin/master'