Upstream to 3.0.97

PS1: Upstream to 3.0.96
PS2: rebase
PS3: fixed derp in arch/arm/mm/cache-l2x0.c
PS4: rebase
PS5: derp in commit message
PS6: Upstream to 3.0.97
PS7: derp in commit message

Change-Id: Ie11e204f5e73b69ae43ec274015fa849004b166a
Upstream to 3.0.97