am 27c782bf: am 50a06fe3: am dd8edfdb: Manual cherry pick of build more sdklib tests.

* commit '27c782bfcdbec689fc7d195fe485e6f2c623e7cf':
  Manual cherry pick of build more sdklib tests.