Merge \"Cast AndroidResources back into the firey chasm from whence it came\" into nyc-support-24.1-dev
am: b7cda54556

Change-Id: Icbfd733b654566c02db2c0e222526e7d765f4d48