Merge "liblog: restructure log/log.h and android/log.h" am: 11a7165ecf am: 9fd2ffc145
am: 5290d85f54

Change-Id: I1b4fb26967d5dfe5af102710fbf9b5170dd19f04