mips: minor upstream integration

Change-Id: I0db8b9ad09a6743e1f3f122d2f30131f8fb62c82
6 files changed