Merge "re-enable HW acceleration in DRT"

        </activity>

        <activity android:name="TestShellActivity"

          android:launchMode="singleTop"

          android:hardwareAccelerated="false"

          android:hardwareAccelerated="true"

          android:screenOrientation="portrait"

          android:theme="@android:style/Theme.Light"/>

        <activity android:name="ReliabilityTestActivity" android:screenOrientation="portrait"