Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 2b2bfd44f1
am: 3896a9d6a2

Change-Id: If25c61b408b69ba6a24d3bf8c29fe63f85ab1806
tree: 560eb7054498800cd27e93d70c7d09fdfe401d06
  1. camera/