Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev