Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
tree: 8757798ec81ff5b2a0ed7693bd80d4928c5a5b2d
  1. camera/