Merge "Fix 20795 crash." into klp-volantis-dev
tree: 7962d2a1c7895fe807ba3f4ebd87e172160f2f10
  1. halimpl/
  2. src/
  3. Android.mk
  4. CleanSpec.mk