Merge "Change Context parameter to @NonNull." am: d6f68696ab am: e67575c6c4

Change-Id: Ic10e7e0a6576339b2b6887f3b740920f7a2d6365
tree: da522522758895b631e7942d6637575ba6fa1465
  1. Android.bp
  2. CleanSpec.mk
  3. src/