Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0
am: 14ba2e78fd
* commit '14ba2e78fdef008672565901e72c46dc4fa09ae3':
Change-Id: I5d6682efb5cea9a98caaea37a6d547848999177e
This commit is contained in: