Merge "minadbd: track adb C++ version change."
am: b67811dd49

Change-Id: I5ed644ad8dcd1929599520ccca11e5dd75f84db0