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

Change-Id: I9e131dbb527b7c948b828e7a1d141dff7a91a9ec