Merge change 26156 into eclair

* changes:
  keystore: exclude builds for simulator.