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

* commit 'cebcfc6f05bd77bc1db46b57532732e3b9e5cc29':
  ContextCompat should be non-instantiable, all static methods

Change-Id: I65fe28324a5e76cb48ed1ffebc3602682d6940d3