Use Android-L and fix tests