Modifications enable use by the build system. am: 88d0f99dee am: fcd3e09426 am: 0f5621ae4b
am: 35253eb124

Change-Id: Ie787f8223dca718a3196a57ac9bfa1a5c4704f02