Merge Native Dualboot commits from upstream
CWM 6.0.4.8 / 6.26.6