merge "Fix mass storage in recovery"
6.15.4 Release version
initial unified device jflte
loki: add support for unified devices

fix loki user setting could be overridden on edify install_zip commands