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

Change-Id: Ic16bb1298ac85276d1119b3c9a69dc1e527edb39