Added r18 of android support lib