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