Merge latet hammerhead kernel changes from google/kernel/msm
Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>