Revert "Import Jack and Jill Brest 1.1-rc4" This reverts commit 514364a5f73decd43d19ae0b73ad85f21239684c. Change-Id: I31bbdd4de7f8dfcfc3bebfe529446fec56baa925