Powermock was removed by change Iafcc40d2f but was unintentionally added back when change Ib0dd147bd was merged up from stable-2.16 (where it still exists) to later branches. Change-Id: I1c17212208d122b7212647e84894bd5b6f69e75f