Add android 18 support