Merge aadb4613450d6957c459a1b24ad5fe3d37b4799e on remote branch

Change-Id: I37d891bb4bfcec8b4f49f018513979d65765deb2
tree: 4962cc8dc5ad87a5b01472a61cbf3d3a0993d72f
  1. camera/
  2. display/
  3. wifi/
  4. Android.bp
  5. os_pickup.bp