Merge "Disable dexpreopt and <uses-library> check for "framework-res"."