Merge "Remove INCLUDE_TEST_OTA_KEYS."

  ADDITIONAL_DEFAULT_PROPERTIES += ro.debuggable=1

  # Enable Dalvik lock contention logging.

  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.lockprof.threshold=500

  # Include the debugging/testing OTA keys in this build.

  INCLUDE_TEST_OTA_KEYS := true

else # !enable_target_debugging

  # Target is less debuggable and adbd is off by default

  ADDITIONAL_DEFAULT_PROPERTIES += ro.debuggable=0