Merge "Avoid signing debuggable boot-debug.img"