Minor build changes

Change-Id: Ie28043e0ae5b3bdc373a6f8937cd826e532f90fb