am e3804bc5: Merge "Remove checks for TARGET_SIMULATOR"

* commit 'e3804bc5d0187112d9760e36b9a1e23a9a63bf9f':
  Remove checks for TARGET_SIMULATOR
tree: d89b2546ff4443d0876558b99074e1ecfacb0fd3
  1. 60xx/
  2. 6515/
  3. 65xx/
  4. Android.mk