Merge "Use ro.debuggable instead of ro.build.type"
am: 37c90df931

* commit '37c90df93111b5ce08720f8c614dd9e946679ac4':
  Use ro.debuggable instead of ro.build.type