[automerger skipped] Improve tracking of exported sdk libraries am: 442a4755...
[automerger skipped] Improve tracking of exported sdk libraries am: 442a4755 -s ours am: e2ecba38 -s ours
am skip reason: Change-Id Ia99def91e9b74d2ed0a777de04b476c00ea0393d with SHA-1 859fe961 is in history
Change-Id: I4203102c43cf3a9b97d0311ef73ce7bf1b5d89a1