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

Change-Id: Ifbc6a6885e02c1543f998d02dcde65986ad9173f
tree: 03462dcbee4e1af11dd66d012a8f8c111ac2cf80
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk
  6. README.txt