Merge "Switch am command to go through "cmd activity"."

#!/system/bin/sh

#

# Script to start "am" on the device, which has a very rudimentary

# shell.

#

if [ "$1" != "instrument" ] ; then

    cmd activity "$@"

else

    base=/system

    export CLASSPATH=$base/framework/am.jar

    exec app_process $base/bin com.android.commands.am.Am "$@"

fi

cmd appops $@

#!/system/bin/sh

cmd appops "$@"