Merge "Revert "Move location provider lib to frameworks/ex - 1""