Merge "Move test APKs to DIST_DIR" into mnc-ub-dev