Merge "Add support lib for API 21"