Merge "Revert "Break down jank between frame drops vs. triple buffered"" into pi-dev am: fbb4b82156
am: 0541ada6b5

Change-Id: I3abba97d7d3bd7e7a41376b818e586629fd5ce07