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

* commit '1a9f5c293c7a1f901666839d0a9f6984d09ab38c':