Move compatibility files out of prebuilts dir. am: 78b3d573da
am: 43c8ea3b4d

Change-Id: I6962a57683745fd917bacef13996627f3d32bb14