Android Lollipop support

Change-Id: I957cac72f2e9764c26aaa8389087ddf83d3cd25f