am 163ce0f6: am ebf93bb5: am 75b28573: Fix sim build for unbundling native code

Merge commit '163ce0f62f7992d2c79257965919fcc1d975a6ec'

* commit '163ce0f62f7992d2c79257965919fcc1d975a6ec':
  Fix sim build for unbundling native code