Merge "Remove com.android.internal{.util} from generated documentation." into pi-dev