Merge \"Build fix: Updating SDK for tests\" into ub-launcher3-calgary
am: 0843675e93

Change-Id: I0c7863bd507f64b00f1c5d497f56c4ac82064a3a