add ActivityCompat.java.
add ActivityCompat.java.
Merge commit '3f67c582e0c9ee9c609855968b8adcfc29a7a36a'