am 6ac202be: Move some system services to separate directories am: ae31a40841

Original change: undetermined

Change-Id: Ic72d477966b77c6e3b4a7227e7b6379d985be0c2