Reconcile with jb-mr2-release - do not merge

Change-Id: I01671fe532f8a0807e4bfd86c51f169e93b3d54a
tree: 8ad2449ee581d15a30db66a19fa8bb8f6a20af55
  1. src/
  2. Android.mk
  3. CleanSpec.mk
  4. MODULE_LICENSE_APACHE2
  5. NOTICE