Android H update

Moderators: Sabertooth, markrocha, GordonHannan