Merge changes Id5a153ef,I7be3bbfe

* changes:
  Don't preopt system server apps in system_other.
  Introduce a whitelist for core apps used by system server.