Feature control config file in system image
am: 9fd4870d14

* commit '9fd4870d1481d6e1ecdefb8ea3706a2d422fc5c2':
  Feature control config file in system image

Change-Id: I0ec81f681eb485c6623fd6c866bf6b0287c38f35