Merge "libcutils: fix system-background tasks shown in top command" am: e4e4777fc7
am: 48eaef5804

Change-Id: Ica9a0274a89ce110d54a28d4828cd8196c350161