Merge "Freeze HIDL HALs for Android T." into tm-dev