am 8c3f00c2: am fdc3990c: Merge "Revert "Introduce support for hardware simulators, starting with ARM64""

* commit '8c3f00c2f4699f20b1336c5e3640b2d869d7b078':
  Revert "Introduce support for hardware simulators, starting with ARM64"