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

Change-Id: I93ac1e0253ac2f80e829ebd8b04438733e1edae3