Made changes to the tests' Android.mk; got most of the way, but it's getting stupid.  Changing tack.
Made changes to the tests' Android.mk; got most of the way, but it's getting stupid.  Changing tack.

brettdh/libpowertutor,brettdh/libpowertutor,brettdh/libpowertutor,brettdh/libpowertutor,brettdh/libpowertutor