Make a better effort to detect a framework lie.

Bug: 17130496
Change-Id: I1a3631670c152d9b7667c9c4e08e14c48569eef5
3 files changed