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

Change-Id: I147ed04bde78be2863b3cde9c0ef50f227e7f9c9