Merge changes Ibec5b263,Iabe80f7e,I820fa224
am: ac0260176a

Change-Id: Ie9a8e46980a017ada36861b07fbc86ba1bb77889
tree: 32ce9f203c90fef25326b771df9a51e42eaece3a
  1. devicetree/
  2. net/
  3. Android.bp