Merge commit 'remotes/korg/cupcake'

Conflicts:
	libc/include/dirent.h
tree: e7e5bbf630dffdea230e9601bf4cbe91272b299c
  1. libc/
  2. libdl/
  3. libm/
  4. libstdc++/
  5. libthread_db/
  6. linker/
  7. Android.mk