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

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