Merge 8c927712bd5dbba6bc6b0cbf485a55ffc2f0fa0c on remote branch

Change-Id: I9c2f3eca42f234f9957d4d639ba8381b0e170f3c
tree: b62e4fab7dad97d4257f7cc7f87af79b7d61b3c1
  1. camera/
  2. display/
  3. Android.bp
  4. os_pickup.bp