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

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