Updating to r4

Updating to the latest point release of Android