Snap for 7336629 from e92a17f5b47f543157ad47794350109fb27def7d to ndk-r23-release

Change-Id: If18c77cfbdccf6cd874e5052783075517163e0ee