Merge "Un-deprecated Android mock testing APIs" into nyc-dev