Flags cleanup

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Merge remote-tracking branch 'sm/sm-jb-mr1' into HEAD

Conflicts:
	BoardConfigCommon.mk

Signed-off-by: Paul Beeler <sparksco@gmail.com>