Merge "Support inline dex data"