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

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I4a853b57b8cfbc834e43e050f26bc078c1b4e92c