Use java.util.Objects instead of internal API

Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
Merge "Use java.util.Objects instead of internal API"
Merge android master into mk

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>