Merge "Make android.test.mock use api_srcs instead of jarjar"