Merge "Revert "Hide AssetInputStream.getAssetInt.""