Merge "Fix errors caught by aapt2"

    <application

        android:allowBackup="true" >

        <uses-library android:name="android.test.runner" />

        <uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE" />

        <uses-library android:name="org.apache.http.legacy" android:required="false" />

        <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />

        <path-permission

                android:pathPrefix="/btopp"

                android:permission="android.permission.ACCESS_BLUETOOTH_SHARE" />

    </application>

    <!--

    This declares that this application uses the instrumentation test runner targeting