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

Change-Id: I4a346d743d7c54523405433df3fcbe412fa8343c