Merge "[ATF integration] include validator in layoutlib am: 9fc4e188f3 am: b643d07b96 am: 618fb446a4" into rvc-qpr-dev-plus-aosp