Merge "Revert "Use dex cache from compilation unit in RTP.""