arm: adapt upstream updates and current kernel for each other

Change-Id: I40935ec355ee1f82c6d1b9135440dc7dac82023a