Merge "Detect Android devices vulnerable to CVE-2011-1823" into froyo