Merge pull request #3 from jakew02/android-5.0

shamu: fix path typo
shamu: add remaining time services