Fixes for a few problems using new crosswalk for Andoid.