Layout tests API 15 compatibility
am: 32b80d0963

Change-Id: Idf3255fffc58907a7f4d40175cb05364a450d710