Merge changes I1ee1ee05,Ieb6d9f68,Ia3d77625

* changes:
  Add atrace and multinetwork symbols to android-23.
  Copy libandroid.so symbols from L to M.
  Revert "Add atrace and multinetwork symbols to NDK"