Update patch according to Andrew's feedback

1. Use __builtin_ctzl to calculate the shift value from ADDR_SPACE_SIZE
instead of introducing a new definition
2. define constants for the shift positions of the TCR_EL1_IPS_SHIFT
and TCR_EL3_PS_SHIFT rather than using integer constants