More make file tweaks

Change-Id: I26fa571b151c50d133b550395576d4e0246e18bd