Fix symlinks

Change-Id: I417b7e20e2fcd3f3e0464e2627548028379ad365
Remove duplicate and outdated location providers

Change-Id: I3e3ead15c79efdb6e22fc7e48a72ea5bfbeea12a
Merge branch 'cm-11.0' into martincz