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

Change-Id: I191eacf3b28eaec2575848266e5708a4b65ce83a
tree: 8757798ec81ff5b2a0ed7693bd80d4928c5a5b2d
  1. camera/