Merge "dx: De-dupe prototype reference classes"
am: dd15c4cf01

Change-Id: I0332532b55882e3d3672caf29e711784b7884d04