Merge "Fix errors caught by aapt2"

          package="com.example.android.nativemididemo"

          android:versionCode="1"

          android:versionName="1.0">

  <uses-feature android:name="android.software.midi" android:required="true"/>

  <application

      android:allowBackup="false"

      android:fullBackupContent="false"

      android:icon="@mipmap/ic_launcher"

      android:label="@string/app_name">

    <uses-feature android:name="android.software.midi" android:required="true"/>

    <activity android:name=".NativeMidi"

              android:label="@string/app_name">

      <intent-filter>