Update to SDK 21. Getting ready for L