Merge "Correct the year definition in Android.bp" into main