Merge branch 'android-framework.lnx.2.0.r5-rel' of git://codeaurora.org/platform/system/vold into cm-14.0