Add m4 to the prebuilt build-tools
am: 9867042b2c

Change-Id: I88aeeadb97f5ef84da726b8799225a1b210cc078