build: allow use of openjdk and other versions of make

Change-Id: I2e3c7f89ce51888afb9cda30eeaf6d757b057e2e
Squas cm build commits