[automerger skipped] Search for subhal .so files in additional directories am:...
[automerger skipped] Search for subhal .so files in additional directories am: b42bde95 am: f26ba8c5 -s ours
am skip reason: Change-Id I8a676b97f6f6992e8937ecf31c3b7af06e676ebb with SHA-1 c786dfc5 is in history
Change-Id: Ie1f390cb19b5089221b43763584aa60155339eb0