Merge "Clearkey PRODUCT_PACKAGES makefiles" into tm-dev