Handle allocation failure in AddPreResolvedStringsArray
am: 1fdbca644f

Change-Id: I09061401925882590a87ea1351153a25bced1336