Merge "Silence yet more superfluous build messages." am: 01e1fe60b8
am: c792d08bd2

Change-Id: I009eb004485f9ce1c818403d5a24712833f44224