Unable to make separate arm and intel builds in recent Unity 5.4 onwards

We've been using separate ARM and Intel builds for the past few months and have successfully uploaded and published our games on the Google Play Store.

We've noticed in newer versions of Unity, despite selecting ARM or Intel, and Unity generating the smalller APK file, Google Play Store detects the APK as "Native Plaforms: armeabi, armeabi-v7a, x86" when we upload it to the Alpha channel.

We believe Unity is generating the right binaries as the ARM-only & Intel-only APKs are smaller than the FAT APKs.
There must be a problem in the manifest of the APK that is reporting the wrong type to Google, and our concern is that this will mess up the publishing and update scenarios for all our users.

Is this a known issue with Unity ? (we are using Unity 5.4 presently)

Is there any known, safe work around ?