Merge "Fix keystore_backend_binder"
am: 8fe42895ae

Change-Id: I461705589cfe1ab5c5cc5d43419e2234ba393bbe