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

Change-Id: Iefe805a99749c29865b7f871cd4fc3fe11e1e536