Merge "Cleaning up main code" am: 0a785083bb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2485617

Change-Id: I7aa6677156cc27349d42e71dd3cfc5b7e5d374b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>