Merge "Directories are always enabled; update assets." into klp-dev
tree: a537661177e01276641c7f8fa078df2ebd3088e6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml