* Someone apparently decided to "Replace-In-Files" these before, but
they are not correct according to the folder structure
* Since it is just annoying to read the code in AS when it does not
match the folder, change the package name back
Change-Id: Iea5c51aeb9e1f5b650a1009348065c7c38cddbeb
* Since we already compile with sdk "current", this is just the next
logical step
* We skip 35 for now since edge-to-edge stuff can be done later
* It also gives AS the possibility to recognize necessary steps
* WRITE_SMS permission removed in API 23
Change-Id: Ia567fa9e42772f0b6d6e6fdc0d21b5635ff9dcc5