Updated Stk...

Change-Id: I1db73ef5dbbe911c80d1ecc411bc5f6895fbba70
Merge branch 'lollipop' of https://github.com/TeamHorizon/platform_manifest into lollipop