Merge "Revert "Revert "The com.android.athome api classes are moving android.support.place."""