Merge stage-aosp-master into pi-dev-plus-aosp
am: 3da8b8d418

Change-Id: Ieaff6239c099d90e9a79e35fd4bad452a2cb29a7
tree: de1f6e56d8aee89570b9bd4fde9ba179dbd66fd2
  1. devicetree/
  2. net/
  3. Android.bp