Merge "Check for pom2mk in path when updating androidx too" into pi-dev
am: bc3f4bcf93

Change-Id: I0b7449ae0bd201e3d2137e0e4443466a5aa291ae