Merge "system/core: preparation to pull back interfaces from android/log.h" am: 27d2d49f48
am: 8a7297a09f

Change-Id: Ia1289b9912a1171700f6c86782324f668cfbe8cc