Upgrade the targetSdkVersion to 21

JavascriptInterface annotations must be added to the SourceEditor for
JavaScript calls to continue working.
Merge pull request #621 from jonanp/new-sdk

Update SDK to v21