Merge "OEMCrypto v11 for Fugu N am: 81e89cc453 am: 72aab93ac7" into nyc-mr1-dev-plus-aosp
am: aed9716b54

* commit 'aed9716b5467e75728f761ac75a4ba5ca3c51ea0':

Change-Id: Ic8bcb3f3849953a336bea0fbd9144102f3492321