Sync back internal build file changes

Change-Id: Ic7dabac2c44cf8c46759a1a03ed99eeff2403f89
2 files changed