Merge "Always build awk." am: 919887ebd3
am: d11a642bd0

Change-Id: Ie25e3f62574423649778e89ceb3205c7a5c38949