linaro fix

Change-Id: Iea4c0b1755e9cb857ca1069320f4d9df3f91670e
Merge branch 'linaro' of github.com:ModdedPA/android_system_vold into linaro