am aa8394ea: Merge "Change package name of multi-dex instrumentation lib." into lmp-dev

* commit 'aa8394eaaa44582bbee403ce75746dc3ac643fb0':
  Change package name of multi-dex instrumentation lib.