Update for the 22.0.4 version of android sdk