Merge "Reallocate keymaster parameters with malloc."
am: 17f2c2f7ad

* commit '17f2c2f7ad95836ff9f45102aaa8c5a7530e89c0':
  Reallocate keymaster parameters with malloc.