Remove checks for TARGET_SIMULATOR

Change-Id: I0a3824174f1a5cf625c638c5901a7c4cecc95d01
Merge "Remove checks for TARGET_SIMULATOR"