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

Change-Id: I6832a8486ba8ca126c3814071b189b328129ceeb