Merge 9634103fe2129ffe0c5b4c4da7827254139613ec on remote branch

Change-Id: I440a741938c25294f214636b720da0db9607ff99
tree: 8e5624d03e5a333e246c49c13ab33f27047a1154
  1. camera/
  2. display/
  3. Android.bp
  4. os_pickup.bp