Merge "Upgrade to tzcode2013f plus Android modifications (from tzcode2013d plus Android modifications)."