am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""

* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."