Build Configuration

Change-Id: Iabc1496f627a1538ada97087e67c15e720ed7b9c