Bug 1103820 - Support new android version. r=mwu