Another AOSP tag update

Change-Id: Ied59946d18c75ec554eba1c736377a46aaec9910