Merge "Update TestHal together with AIDL change"