Merge "Refactor DexViewBuilder"
am: f5617abe09

Change-Id: I1a971bd08a0025fdb365724d522ceb16468a8827