am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev

* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
  Remove legacy HCE APIs.