Update libraries and revert map key
Merge remote-tracking branch 'upstream/master'
Fix trip time and distance label formatting
Center "About this map" dialog in KitKat