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

Change-Id: I9b63dfb569c82dbd686449ebe108c92752d3661d