Merge 2f66c080ca50970c3798025fae53b96b95195636 on remote branch

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