Unfork platform/system/core

Change-Id: I3ab5a5ee8f9ae9b004f54d41b757737be5d6c8f5