am b1a71fa2: am ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"

* commit 'b1a71fa2355f737a1060c8064d0fb5fbc7b17496':
  ART: Add complex UnresolvedMergedType test case