Merge changes I69e6489d,Ic17d52a7

* changes:
  liblog: add android_lookupEventTagNum
  liblog: add /dev/event-log-tags for Tag Map