Add nullable and nonnull annotations

Bug: 135956699
Test: m -j20
Change-Id: I852fffebed9b63239a1f383ff4ad09f156fbb39d
2 files changed