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

Change-Id: Icf1f61f40ed9300d21373a7b3da4155be5e7b248