Merge "Add more linker debug log." am: b94e6895a3 am: be746a7691
am: 754154528a

Change-Id: Idd9c7601927c7e0da04260782b880c8f7a9444f0