Remove import of libcore NonNull annotation am: 144324ce06 am: f2e426c80f
am: 77d431ee9a

Change-Id: I75ea672897aff9c46fb46a942d8989a09466cf91