Merge "Enable CONFIG_CRYPTO_AES_NI_INTEL (update kernel prebuilt)" am: 4a96c1f60c
am: ee6ea5eea7

Change-Id: Id4e8f82933d15679a28b49cfa71dc286879dd3fd