Merge "Clean up linker fatals slightly." am: 1bac61f0 am: f54872e5 am: 227782dc am: 5827d21a am: f56cc5de Change-Id: I3413b86342dcafb23f16a245efc0693b3a4b18b2