Makefile fixes.

Change-Id: Ic46ff78e3c139ec31d60c0725772b8cab826ea84
Some trivial improvements after review.

Change-Id: I21bd9e0d0c15d41b6e8a314de1343bf142eb57ba