am ed5c99ea: am 09a0b17d: Merge "Allow native bridge to work without a code cache"

* commit 'ed5c99eaccd7382689d683ddfe6c164c86f2e71a':
  Allow native bridge to work without a code cache