Merge "system/core: preparation to pull back interfaces from android/log.h"