Merge "Removing $(PRODUCT_OUT)/root/root" am: 8cbbacdc15
am: d29ac08509

Change-Id: Id187c62961faefbccd9d14c9adcf4d4476d6d66e