Update

Change-Id: I53f52bb4e6e333a7165697457e6a7aab960aad06
Merge branch 'DJL10.2' of github.com:DJLIII-Kangs/android_build into DJL10.2