update to new AOSP r5 TAG

Change-Id: I57523aa622d94eb819c0e2bf5eaa4ac50f72e896