Merge "Remove libservicestestsjni"
am: d00478e9ad

Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c