Merge changes I48840207,Idc5de13c,I8f2b7ab3,I2460106c

* changes:
  Keymaster 4.1 VTS tests
  Update KM4 VTS tests to allow s/w implementation to pass.
  Remove service death test.
  Change finish input test to avoid large sizes.