Merge "Remove libservicestestsjni" am: d00478e9ad am: 301c714b43 am: dcb0c55c15
am: 9d273bfec1  -s ours

Change-Id: I2c890897639f807e8f8cdd2217d6f3cf13833b4e