Merge \\\\"DO NOT MERGE add private function converSafeLabel\\\\" into lmp-dev am: 18d33742b6  -s ours am: dffa158e60 am: 7e3c00dd2d
am: e09a832a72  -s ours

Change-Id: I83deb4551bd3584b9178efc15ce0371196884aab
tree: 856934054e32ba9f8858905db3f58aa9bf3640a9
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt