Merge "Revert "Stop building boot-with-debug-*.img for GKI""