Merge "Revert "remove /dev/log"" am: fcfda81b86
am: 7469d816b6

Change-Id: Ie36c6266cc3387bba02974fb65614c75c8bd1425