Merge "Resolve ro.debuggable at build time"