Merge "Be clearer about linker warnings." am: 8edbb3eb45
am: fa534b4057

Change-Id: I331fde24864a98fe4d6c8cba0ef056e3273ae595