Merge "Make layoutlib more lenient with recoverable errors" into oc-dev am: 3134462c5e
am: 510916c13f

Change-Id: I3c02fde71a2fc7b955b9ad124fe81eccf5a983a3