am: f2af6831 -s ours * commit 'f2af6831': DO NOT MERGE: Initialize layoutlib variables before using them