Merge "Add dequickening support."
am: 2dae2f256b

Change-Id: I9805a26323da3fdac86007c40c352e785a072f21