Removing dependency on android-16 platform since we only currently use 17.