Merge "Support for dex signature -> source position map."
am: dc0e42a5cd

Change-Id: I8307f62e965946323f910334d98166f7b92e723b