Merge \\\\"DO NOT MERGE add private function convertSafeLable\\\\" into mnc-dev am: 26af9db300 am: d36c2d23e0 am: be24b21235
am: 5a7f942917  -s ours

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