Reconcile with jb-mr2-release - do not merge

Change-Id: I03fc6d2dac608cdc0e0c83a87cc90b821f4be52c
tree: cf1f47dc608c875a4bfe2aee97727d4c279e4f7b
  1. audio_effects/
  2. audio_route/
  3. audio_utils/
  4. camera/
  5. CleanSpec.mk