Update API
Merged the Android 5.0 APIs with existing Android 4.4 APIs