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

Change-Id: I44f524880cd1ad0042059f38e44d437495b8f799