Reconcile with gingerbread-release

Change-Id: I04ace1c344bedc2525a6c1eb8abe78b2f42d08a6
tree: 1effcc1663b586683588aab2071eb7b4202a101f
  1. app/
  2. firmware/
  3. Android.mk