update_engine_client_android implement --merge am: e5a8f23df2 am: 42ff364d65

Change-Id: I967556fb95f0758fb304fccdf16fff7e490e1baa