Merge "Put atf prebuilt through layoutlib bytecode manipulation" into rvc-dev am: e836d36b4d am: f712290a7e

Change-Id: I36a7565f21c9aea931d951d26fbeedcd7c63637e