Merge "Fix error handle regression" into pi-car-dev
tree: 2734e60846e6dfc5cdb2dedb844d4d8a5a460d3e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml