am a25e258d: (-s ours) am b84e1f54: am 50de8224: Merge "Enable perfboot.py to install APKs before measurement."

* commit 'a25e258d657e61f63ed1d278224f49ed244d59d2':