Merge "Fix unquickening logic for quickened input dexes"
am: 037194d280

Change-Id: Ic27df744745d6896a646cad13b81651e8b40400f