Merge "liblog: remove log_portability.h" am: e2dad0a296 am: 45f06c49fa am: f29a1a65f3

Change-Id: I749d07651b4529f52db2064185b2b639b13c8289