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

* commit '5e0abcda4318efdf98de930307ce923a44f5fe6a':

Change-Id: Ief167e1d4ab632d9fcbe8da5f59a1d7695bcf427