Merge "Handle multidex in LocationIsOnSystemFramework." into pi-dev