Merge "Increase timeout for microdroid commands"