Merge "Rename from com.android.rs.test -> com.android.rs.refocus."