Reconcile with jb-mr1-release - do not merge

Change-Id: Id3157ca77b5d15212de07d443e5f26a2c4db80fa
tree: 0f338e85b5eb82215070d02f8e7d530819691414
  1. src/
  2. Android.mk
  3. CleanSpec.mk