resolve merge conflicts of a260b85 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: If934df91847c0eedf318d8b265cb33428bb33c49

diff --cc Android.bp
index ebf99c2,7aef46b..56eb730
--- 1/Android.bp
--- 2/Android.bp
+++ b/Android.bp
@@@ -1,5 -1,3 +1,6 @@@
 +// This is an autogenerated file, do not edit.
  subdirs = [
 -    "*"
++    "net",
 +    "wifi/keystore/1.0",
 +    "wifi/keystore/1.0/vts/functional",
  ]