Fix soong dependency issue am: 381019d9ce
am: 42cf6cbad9

Change-Id: Icef9c49054642b5b53f2e3265457c543e9b01267