Merge "Disable VT when RTT capability is on" am: f09ef291f7 am: 7a138c4818
am: ba040c3a9f

Change-Id: Ibc03b597e6034f029ce82bf768f2e9a11c42d507