am effc95cb: Merge "Make dex merging stateless."

* commit 'effc95cb732d8d5453930e647240a1665b6dc71a':
  Make dex merging stateless.