Feature control config file in system image
am: 9fd4870d14

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

Change-Id: Ie2c21552b64dad8aa535d803e7b15375a65a8ef6