Commits
Deepanshu Gupta authored 87be67f9171
Fix layoutlib [DO NOT MERGE] Fix a NPE. The cherry-pick differs slightly from the original to remove changes not relevant to the current branch. Bug: 11140701 Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf (cherry-picked from 28873c1f008f4fe24441923e14f30e55d6f0967a)