Merge "Change userdebug/eng check with debuggable device." into udc-dev