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

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

Change-Id: I69ddf8c8e04497ec17c42fad691ff1589af4cae0