Merge pull request #4 from jakew02/android-5.0

shamu: update time services
shamu: TimeService is prebuilt