[automerger skipped] Merge "Migrate system/core/base to system/libbase." am:...
[automerger skipped] Merge "Migrate system/core/base to system/libbase." am: 3b55f757 am: 876e883e -s ours
am skip reason: Change-Id I1134f1e9e968b9273748e2483bea8d25e5c9e994 with SHA-1 09f39481 is in history
Change-Id: I58aaf4ff41a7a930ae12e9ebca48fc7453732d70