m7-common: Rebase to current CM state

Change-Id: Ie1c68bdc4d9e5d75e6e7ae143b1d18dfad7c3461