ci: Bump Android SDK commonline tools to version 13114758 and misc template fixes