Merge "Put atf prebuilt through layoutlib bytecode manipulation" into rvc-dev