Merge "apq8064: Fix the condition check for apq8064 variants"