am 792e2691: resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp

* commit '792e2691276ffac5538e905b7fa8e9607b554283':
  Add code cache tests to libnativebridge.