Merge "Add missing profman arg for compiled_method_threshold" am: 00c8642809 am: 6bec95be5d
am: 31e58f5e8f

Change-Id: I602c37b8d364ac74edcf8117e19aaf284de8714b