Merge changes from topic "move_keymint"

* changes:
  Remove references to keymint1
  Move keymint to android.hardware.security.