am aae9a105: (-s ours) am fe0e8709: am 76111ecb: (-s ours) am e093bbf3: am d861fd81: Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

* commit 'aae9a105e9bf3a92033cc06481eb2fa40c6c6144':