update_engine_client_android implement --merge
am: e5a8f23df2

Change-Id: I640f91c17ffc235cd3369220f1f97f04b299b418