Merge f33a39f7e8bd3be75a6843470449ccd86824bf97 on remote branch

Change-Id: Ib3380a428c674f75792873e223cfec3b236bf982
tree: 98c4ee6891b1f36b84209145ad7e5dbb9b64dd29
  1. camera/
  2. display/
  3. Android.bp
  4. os_pickup.bp