am 66c51bef: am a0bef60c: am 05ed2d91: (-s ours) am 42e53ecb: am 66d91401: Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

* commit '66c51bef2f1ec2d98e3e15200a9bca382529fa4f':
  Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]