Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk"