Update for DJL5.0 AOSP 5.0