Merge "Use ro.debuggable instead of ro.build.type"