Merge "Refactor DexViewBuilder"