Merge "Convert hostsidetests/webkit/Android.mk file to Android.bp"
am: cf4c7e3a29

Change-Id: I719796302312cd1a201b21405f57aaebe07ad9f4