Remove old configuration values for demo mode

Bug: 62712426
Test: make -j100
Change-Id: Ibe8a89208ba93d7074800f087798678371f72fb8
2 files changed