[automerger skipped] Merge "Migrate system/core/base to system/libbase." am: 3b55f75706 am: 876e883e0e -s ours am: 85aa3847f2 -s ours am: 8a60cec090 -s ours am: 21f36e352f -s ours

am skip reason: Change-Id I1134f1e9e968b9273748e2483bea8d25e5c9e994 with SHA-1 09f39481b1 is in history

Change-Id: I6f1bfe29ac7a547181851567f41513418ab72679