merge -fno-antilasting

Change-Id: I74b25aee4af9f3d33660d13f7b5cae0209d64ee6