Merge "Using res-auto namespace instead of com.android.contacts."