Merge "Add libcore NonNull annotation and core-oj jaif file"
am: 82f2eab504

Change-Id: Ifc173fecf95c648936044c9df03f8f8f08a6bb7d