Merge "Revert "Whitelist com.android.perftests.core in am instrument."" into pi-dev