Merge "Removed all com.android.internal.* references in code." into arc-apps