Bug 894891 - Follow-up to fix bustage, remove unused shader from the enum. CLOSED TREE
Backout 7c2fd5db93b2 (bug bug 895646) for breaking the build on a CLOSED TREE
Backout df425bca5665 (bug 893977) for breaking the build on a CLOSED TREE
Bug 894405 - fix leaks on a CLOSED TREE

--HG--
extra : rebase_source : d96236c0c9c370bdb055d3ab197707d48f8afe80
Backout 111b3d84c479 (bug 885962) for Android bustage on a CLOSED TREE

--HG--
rename : mobile/android/base/resources/drawable-mdpi/lock_identified.png => mobile/android/base/resources/drawable-mdpi/site_security_identified.png
rename : mobile/android/base/resources/drawable-mdpi/lock_verified.png => mobile/android/base/resources/drawable-mdpi/site_security_verified.png
extra : amend_source : aff11fe057de12ee7ec2fff8814a78b415d6554a