Merge "BuildTest: split out test expected to fail on prerelease builds" am: 535e643c2c am: 89e81d8965
am: 81f9f6a21a

Change-Id: I9911e668fb515a8eaddd3cfadf66308c158856cd