More build enhancements.

Change-Id: I0262dad2050093e5ddd7cb8beb61de6e4f880361