Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7
Gaurav Shah authored
am: 1fb1926e

* commit '1fb1926e':
  Reallocate keymaster parameters with malloc.
14dfda19