Merge "liblog: test: enoent requires userdebug or eng to run" am: c408e77095
am: 6c919e72f7

Change-Id: Ie987570623b8bb0a5e5597a5102c29350d56282a