Merge "liblog: restructure log/log.h and android/log.h"