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

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

Change-Id: Iaff3c805623530db18bd333c0713d832ced8055d