Merge 06b961b5b37975997d2c52f16eab68ac860342df on remote branch

Change-Id: I9fc7a72f7c06473ec5bf12c08f07612656a304ec
tree: 572c21d85c832b56dd24165b5d183d165a99ef97
  1. camera/
  2. display/
  3. wifi/
  4. Android.bp
  5. os_pickup.bp