Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp
am: 170cf7938a

Change-Id: Ibca4df1f59e9a71f4d8331886050b9cee147ace1