Merge "Merge "[IncrementalService] fix native lib check after OTA" into rvc-dev am: 9093346b am: 4d7ce777 am: 129e0af9" into rvc-qpr-dev-plus-aosp