Merge "ART: Disable Wunreachable-code for tidy" am: a89ec15111
am: 4cdf96ae39

Change-Id: I961b0c61ad93d56773c5ce3f11a9282d786d214c