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

Change-Id: I1c2f71b2151c1d2682da08b433d8a7556b4e3040