Android 7.1.2 release 11
Fix typo in name of des-ede mapping am: 0af37f8ed6 am: a31bc9eed5 am: 74fe0c16fe am: b4a7437015 am: b3935d5691 am: ff993fed91
am: a20e53c35d

Change-Id: Ie0fecd517786314374cff30f7b424db86df96234