Merge "Support library enhancements, to ease transition of vold to KM4"