Merge 85e4a1947b22939cea7b0d068b42437063c86a90 on remote branch

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