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

Change-Id: Ifa33b20a139a030d4c6e1e1e41f771d960d3198c