Merge "Convert hostsidetests/backup/**/Android.mk files to Android.bp" into qt-dev-plus-aosp
am: b37a3dad61

Change-Id: I4eeb48606659f34b94a41123857b08647fe16209