Merge "liblog: add stubs variant" am: 4e47753338
am: 66e34e6147

Change-Id: I4f7930ce82bdd3d4b704d799ae8fe29a31db0386