Merge "Build: More tombstones in userdebug"