Merge "AAPT: Fix --feature-of to allow non-public symbol visibility"