Merge "Resolve ro.debuggable at build time" into tm-qpr-dev