Merge 9c1fbfbc0e7c928087c24ef6d6ffb430fcad13e1 on remote branch

Change-Id: I5b2dd2c2ccfeca6142cab8e469f81419b44e6fcb
tree: 4e89fe4575db7e202bccb2e259e84d4df9520638
  1. devicetree/
  2. net/
  3. Android.bp
  4. METADATA