$1.5 billion plan for Oakland waterfront