Merge "Refactor DexViewBuilder" am: f5617abe09 am: 0ea5d04aff
am: 75f7f68128

Change-Id: I53afd6879f86b710f272bfa9ee8d45ec908029ce