Merge \"Add atrace and multinetwork symbols to NDK\"
am: 59a4978c1c

Change-Id: I64d8966628df27fe46a794730f43c61a5b1e8c55