DO NOT MERGE add private function convertSafeLable am: 0af0a3bf21 am: 998af3d7d6 am: 9d9ed4b65b  -s ours am: 1af2354e23 am: 7f58bf8b7f am: ff02e4a77a
am: 014d1eb983  -s ours

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