Reconcile msm8226 with Muppets

Change-Id: I3d22604db24510c86c88824a651eed69eefa7f8e