Design and Evaluation of an Improved Integration of WiFi Fingerprinting and MEMS Sensors in Smartphones