Merge "Add more linker debug."
am: 60916654cc

Change-Id: Ia9dd38aa2908beb2aee608915880fd510adec05d