Merge "ContextCompat should be non-instantiable, all static methods" into nyc-dev am: 622cd77c72
am: d1566c1e9b

* commit 'd1566c1e9b623b46f28aac8f4ae0c4908ae31a23':

Change-Id: I88d9b7e422155d4364934ff0c176ed80251aee36