Merge "Fix package path of android/soong/android pctx"