Mass merge from gingerbread - do not merge

Change-Id: Ic910b73b46987f1123c2b28261fedb626bef9fb3
tree: b6172a42cd497e10c07b1dafbba5fbb2ac157098
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk